From 6adbb34d52a5040028e57449f5047e4e0013ceaf Mon Sep 17 00:00:00 2001 From: James Henstridge Date: Thu, 20 Sep 2001 15:41:20 +0000 Subject: [PATCH] same change as in pango, so that flags types are registered as flags 2001-09-20 James Henstridge * Makefile.am (gdk-pixbuf-enum-types.c): same change as in pango, so that flags types are registered as flags rather than enums (not that there are any flags here at the moment). --- gdk-pixbuf/ChangeLog | 6 ++++++ gdk-pixbuf/Makefile.am | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 06a662fa4e..d4cae50b55 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,9 @@ +2001-09-20 James Henstridge + + * Makefile.am (gdk-pixbuf-enum-types.c): same change as in pango, + so that flags types are registered as flags rather than enums (not + that there are any flags here at the moment). + Wed Sep 19 00:28:24 2001 Owen Taylor * Makefile.am (gdk_pixbuf_headers): Don't include diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 93ff7588a3..f4515cd7d2 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -270,9 +270,9 @@ $(srcdir)/gdk-pixbuf-enum-types.c: @REBUILD@ $(gdk_pixbuf_headers) Makefile cd $(srcdir) && glib-mkenums \ --fhead "#include " \ --fprod "\n/* enumerations from \"@filename@\" */" \ - --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const GEnumValue values[] = {" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n };\n etype = g_enum_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ $(gdk_pixbuf_headers) > gdk-pixbuf-enum-types.c # -- 2.30.2